From 75205296f971bc3e9134eb9a579b89cd69eb7af6 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 16 Aug 2006 11:53:37 +0100 Subject: [PATCH] This is a small patch that makes a cross compiler successfully compile the sources under the tools directory. This patch became necessary after qemu-dm is updated to a newer version. Signed-off-by: Hiroya INAKOSHI --- tools/blktap/lib/Makefile | 2 +- tools/libaio/src/Makefile | 7 +++++-- tools/xenstore/Makefile | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile index 9417b976ac..38f8ac686c 100644 --- a/tools/blktap/lib/Makefile +++ b/tools/blktap/lib/Makefile @@ -61,7 +61,7 @@ libblktap.a: $(OBJS) -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS) ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR) ln -sf libblktap.so.$(MAJOR) libblktap.so - ar rc $@ libblktap.so + $(AR) rc $@ libblktap.so .PHONY: TAGS all build clean install libblktap diff --git a/tools/libaio/src/Makefile b/tools/libaio/src/Makefile index 8d134cc005..f926670e67 100644 --- a/tools/libaio/src/Makefile +++ b/tools/libaio/src/Makefile @@ -1,3 +1,6 @@ +XEN_ROOT = ../../.. +include $(XEN_ROOT)/tools/Rules.mk + prefix=/usr includedir=$(prefix)/include libdir=$(prefix)/lib @@ -44,8 +47,8 @@ $(libaio_objs) $(libaio_sobjs): libaio.h vsys_def.h libaio.a: $(libaio_objs) rm -f libaio.a - ar r libaio.a $^ - ranlib libaio.a + $(AR) r libaio.a $^ + $(RANLIB) libaio.a $(libname): $(libaio_sobjs) libaio.map $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index b568a24c5a..279a5a5354 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -98,7 +98,7 @@ libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenstore.so.$(MAJOR) -shared -o $@ $^ -lpthread libxenstore.a: xs.o xs_lib.o - ar rcs libxenstore.a $^ + $(AR) rcs libxenstore.a $^ .PHONY: clean clean: testsuite-clean -- 2.30.2